big storyboard update; several bug fixes