attempt to make it working better. not done yet
bumped versions