CHANGE: more fixes, service classes 100% ported to use mysql