Adding most recent bug fixes and stuff from linux machine