fixed some bugs - thanks to everyone beta testing and reporting