Updated a few different bug fixes and performance tweaks