2.3 compatability, removed datasource, slight code cleanup, fixed issue with session values not displaying unless params were set