bug fixes and upload forgotten pushed files