adding 30% systematics, fixing some bugs