eliben Updates and cleanup