Fix y bounds and tune params / collision resolution