Some new documentation and cleanup