sad hack
minor improvments