Fixed the 2-3 most annoying bugs