rename message added

minor bugs fixed