initial cleanup
added basic config