Add initial Decoration support, many misc. improvements & modifications