intro fixes, added program structure