fixes and upg. to 0.2.7