Cleaned up variables and functions
Merge branch 'master' into iss65
Map changes
Level merge