small fixes, but bugs bugs bugs.