Updated documentation, committed missing changes