Test

Made some fixes, testing ‘em out!