- registration improvements (very buggy still)