Adding argument support & fixing + tweaking
Deleting useless files