heroju fixes1
deve completed, now fighting with shit