some fix and new things