Merged moar stuff from CAF (jb_chocolate)