bug resolution and other stuff