Fixed issues from bag merger of local and master branches
-Improved some import syntax (one per line)
-Restored a variable declaration that was shifted into a comment