Added HSS courses plus minor bug fixes