Refactores hardcoded strings
Fixes as per spec 06 tells
Refactores session
Updates constants