some small improvements
not needed
problems when combining JS library files - reverse for the moment
fix missing context