Minor changes (end \o/)