Fixed up the classpaths and text formatting