fixes and contd remarks pr piojo

will now look to divide component