fixed up main a little more