Fix troubles and bugs