cleanup a bit and add targets for testing