Cleaned code, added saved session loading