fill blanks and getclass issues are fixed