Some bug fixes and minor changes on marked...

...clients management.