Cleaned up Extra State Files
State Table Update

Have till common case, buffer filling up to fast.