Updated path definitions and fixed stupid bugs