resolve multiple tickets
bug fixes