-code improvements, peers logic improvements and bug fixes