Minor bugfixes/added todos