some minor changes.. anyway far from ready