fixed a few more bugs, working on userbricks-stable