little fixes/improvements and comments/tests/services