Removed mac dependencets
Trying with even fewer shiz
fix
error handling improved