- Context menu works a slightly better now
- Some code-level fixes