huge amount of bug fixes