Implement missing states, make minor changes #40

Reader ready for testing, but protocol changes required first.
Make protocol adaptions for new wrapper #40
Fix starting state #40