fix intent and constants