Fixed some small things based on testing results