Update registration process + fixes