fixed things, working on linux