Fix how it works bugs that was on bugherd and merging master