Finished SP Glass block(s) (meta); Some tidying up