general changes and fixes, now working with public site