merging branches

removed bugs