Some fixes by Eggman, more coming soon