Testing struct (single object); fixing small bugs, etc.