Fix is locked stuff
Entry validator
Some twerking