taps added & some stying done