more minor rebase issues. it works on the server now.