Fixed minor errors, added todos