fixed bugs: too tired to figure what to writeå¬† ç˙å®s