Working on the comments from Krysset
Merge branch 'master' of github.com:/hansfilipelo/MapMaster2001
Kryssets comments are mostly fixed