Added stuff normally excluded, this is going into an environment used by Mac and Windows uers