done issue #30; small fixes in components