moving more into testing and some tiny changes