Small additions from last commit. Need grafing!