Allgemeine JS fixes und verbesserungen.
Merge branch 'general-devel' into codefixes
Merge branch 'codefixes' into general-devel