Additional validation, more commenting

Everything is validated now!