added misc stuff - todo clean-up