Minor changes

Still developing backbone...