setup updates (Thanks Neffi)

Worked with Neffi and rewrote setup to avoid frames being created when
not needed.