Legal fixes, some aesthetic fixes