Fixing stuff up

Adding doc blocks