Some minor improvements for prototype m002