some Bugfix and Format