Fix small bugs & update performance