Fixed compile errors, added todos