Added various arguments and enhancements. Ready for testing