Fixed some buggy behaviour