Added -w to make, fixed stupid bug that needs looking into