Added ability to add screenstates and modified debug indicator