Fixes and cleanups

-Fixed issue with *.s not being compiled
-Reworked function and variables names, etc.
-Code cleanups