fixed bugs :-)