19-03-2014 Edwin @ Various bug fixes for Trad

various bug fixes for Trad