Cleaned up setup, esp with linux vs os x