added some todos/better error messages