hopefully fixed a bunch of compile errors