Lots of updates, removed several files. Rescue now based on glance.tt