small bug fixes and lvl two