fixed identifiers and such, now compiles and links