made some minor changes, starting to get things running