bugfixes, stub out layers