Catch SPED-3 closing; Resolve warnings; Code cleanup