i maked some bugfixs