minnor bugs fixed