Data fixes

Fixes #266, #267 and makes the layers a bit less transparent.