Updates: if stmt, const, fixes