fixing bugs and finding new ones