Cleaned up various bits. Started button states.