removed debug msg and some plotting issues