Better comments describing the interface and aestetics fixes