updated list
refactored the checking logic a bit
formatting
mount check fix