Tips and tricks additions for 0.7