General Cleanup / added timer to serial