Fixes and add goto
Way more information