fixes, improvements and such