Fixed lotsof paskeros.
Merge pull request #140 from xi-project/allaround-paskofixes

Fixed lotsof paskeros.