Added some bits and pieces

helps with idiot-proofing. Guess how I tested it <_<