working and deployed version 01-05-2014
bugfixes and cosmetic update