merge logbranch with main

[hungumass]

This is basically logbranch merged with main. Created a new branch for easy modification (Sophia's suggestion :D)