fixed some slobodan bugs :-)