added prompts
changed some calculations