Fixed a few little quirks :3