Bugs 25.11.13 fixed

81, 84 and 85 fixed