Added bug fixes w/ Hendrik