-Added arguments -Some bugfixing