Fixed some stuff after customer feedback.