add first step for layers + fix bugs