-Minor updates, variable renames
-File rename