added adt support
made dealing with the datetime deviation more appropiate
fixed nested adt bug