Max changes, improvements and suggestions

Hey! Les dejo unos cambiesillos que se me ocurrieron. Feel free to comment and nitty-gritty line-by-line if you want.