finished some tasks
(#590)