last minute fixes before submit :)