1 bugfix and some revertions (no-frames code breaking frames code)