Fixed some more exceptions and added some more features