Finished dict, fixed compile errors