more fixes
ready to run code