overhaul

many changes. loads much faster