updated code-comments
removed obsolete code
code cleanup
bugfix and obsolete code removed