Bunch of fixes and improvements
Add lib jodatime
Refacts