Some more functions and documentation