Minor fixes here and there + image layer stuff