api services remake, bugfixes