cleanup
Mac support (not compiling yet)