Minor updates. Need to find more time to actually finish this...