fixes to catzdroids