Removed hacks around enter frame events (no longer necessary)
Fixed csproj and solution