Component fixes, working on collider