Correcting important bugs ans add up/down for layers