major fixes, stupid go...