Remove debug
Fix up edit start and some parsing