bug fixes for personal use