More CS fixes
Cleaned up the tasks
Added a message type hint
Added a registrar type hint