pragma once'd headers and cleaned up terminal output
merged