Fixes for #1 #2 and #3 :bangbang: