toxencrypt refactor, apparently forgot to add these comments... also fix include issue