lots of bugfixes and finishes instock implimentation