fixed issues and updated code