Cleaned up, extended documentation