some improvements, serial handling class tomorrow