latest
more bugs fixed