Functional fixes/cleanup

done