This week page in progress
little server fixes
More updates
finish merge
fixes