convert to be rb299 compatible
bug fix to display enabled in rb299
fix some cleanup issues