upgrade to work with Blacklight 4 and generally upgrade components