A lot of fixes to tips and animation