Code cleanup and type information fixes
Fix #138 compatibility with newer edittable versions

This keeps compatibility with old edittable versions