More code cleaning and some backbone fixes