Code Enhancement strikes back

+ somes fixes