50+ bug fixes, new functions, etc