Work on goto rewriting
Bug-fix
Small changes