changed a lot of stuff, working on pub