minor bugs fiexd