fixed some other stuffs