clean up, got rid of trees, mobile fixes