more small bugs fixed