More fixes and some behaviour changes..., a work in progress.