Working on foundation fix + controls tweaks