Added support for displaying type of class in header + some tiny fixes