repaired all issues from today's work plus fixed prefix issue again