Made a small changes in an attempt to decryption to the class.
Worked on allowing cbc for both encryption and decryption.
Changed the cbc for encryption/decryption so it's 'more correct', it wasn't conforming to the instructions earlier. Still not testedthough, so it might have problems.