Priorized todoes
Fixed handling errors when installing

- Addititional code cleanup