Added user deletion

Added user deletion, other various small changes.