clean up target type stuff--use an enum!