Procedure sweep

Went through the procedures and fixed a few things and added helpfull
feedback using Loggers