fixes all around, huge WIP