Initial implementation details activity and other fixes