Fixed minor bugs. I'm happy