Changed configuration for better speed control

and changed some minor things in other files like indentation or
errors reported by eclipse.