Final Version

minor bugfixes