Moving TODO message
Fixing local install registration