Finished hasStateUpdate and fixed some weird bits