Changed file header
Fixed set of bugs