20141020 - fixed some issues