x-traits include support
singleton clone/wake fix + trait version
improvements + cleanup