Last forms

everything looks rather OK-ish. 
do confirm before blindly merging of course.