bug fixes, final version???