Work on levels + Fix bugs