Bunch of bug fixes and added vertical bounds