fixed path issues and added annotations