cleaned up registration, etc.