Added a few things that were forgot in the last commit