removed duplicate method definitions and other minor bugs
removed duplicate method definitions and other minor bugs

ekwoodrich/nirha,ekwoodrich/nirha,ekwoodrich/nirha,ekwoodrich/nirha,ekwoodrich/nirha,ekwoodrich/nirha