Added sources of support, fixed bugs