Lots more debugging, and proper padding on cypher code