cleaned up minor issues (non blocking stuff)