still squashing bugs...darn bugs