sycing between repositories

merging some changes from the im-clever repository into this one