Remove unused mcetool.h
Shuffling and fixing

Also --block takes optional SECS parameter.
Debug off