more bug fixes/it compiles