add edit and fix stuff