pushing bug fixes