A much better FDL, most bugs are fixed
MERGED!