bug fixes, everything works!