more testing + fixed detected bugs