foramtted according to python code conventions
some little bugfixes