major debugging and code clean up
launch files and parameter adaptations