small bugs fixed