working on solving bugs, and testing more