Fixed cipher import, created missing data structs instead of using generic Value, and fixed some warnings