- Made incremental builds work, fixed nasty bug