fixed bugs, moved some menu info around