Added more exceptions, started extending config file functionality