made it all compilable, fixed some modifier issues