Several additions/corrections and removed planking