Compiled, updated, fixed