Entrance level + minor fixes.