working towards linux support. minor changes