small bugs fixed
small bugs fixed