more bug fixes, need to complete links for classes.html