UserDelete working, other minor bugs corrected