More work
Working single threaded + bug fixes & small improvements.