Added missing return statement in rrmdir
Small fixes
Added missing directory separator for tmp directories