Polish + "morning bug" fix