various changes, may the git gods forgive me for not commiting in the past few days