clean up / user api / more specs