last minute fixes
Merge branch 'master' of github.com:rapid-lang/rapid