Fix reference bug
Component clean up
Bump version