Fixes, Completed code!