Checks added

Removed free
Function check for opt short hand needed