fixes based on devill's feedback