Adding and fixing a few things