More updates

- Added Keywords to table
- Refactored code
Excluded assemblies from csproj (still in references for sure)