Cleanup

- Updated deplendencies to latests still working
- Formatted code to latest Xup standard
- other minor changes