Fix bug in mapping functions
Cleaned up startup message