forgot to commit bug fixes from yesterday