removed uses of unused ressources ;-)
some bug fixes