Some cleanup and fixed to Potku-list