Fix for initial block still showing, minor tweaks