Minor updates while studying the app