fixed more bugs!! cleaned up segues