Fixed hidden logic issues that haven't been specified.... Really need to make those specifications....