Caitlyn - Fixed some small bugs