Add more working folders; minor edits