more bug fixes, woops