Major site bug fixes, ready for modifications