Fix booting, cleaned up Stweaks