javadoc
Changes to map loading

- renames mapname to filename
- fill map loads from map
- changed some method signatures
- javadoc