quick and dirty sessions and fixed some controller bugs