Updates and Bugfixes!

Good morning, everyone! I fixed up a few issues, so rejoice!