Fixing known bugs, prepare to close issue