Various fixes and changing text to match specification