Comment positioning is now better, added source and imports tags  and SuperClass/Inteface support