added swap check and mod'd disk check