Adding edits, fixed stupid seg fault.