updates and some serial prints for testing