Testing with Xojo 2014r3.1

Tested with Xojo 2014r3.1 and fixed bugs found