Minor changes and more bugfixes....

Still need to get login and stuff working.... Did a bit
with/"discovered" sessions