fixes & billboard update