Some more testing+changes