Added more to control and minor code cleanup
Made dummy-output