finxing bugs and adding details