Tips and other small fixes