Thursday Latenight coding checking

More bug fixes, beginning on validation..