fixes, updates, incorporating some parts of the old site