Misc additions and corrections to layers reader