fine tuning a few things