removing some code and merging some code with Jespers workspace
small fix