bugs and adjustments