added a probably temporary fix
added some messages