little fixes

Some suggestions and missing code.