Fixed errors

- listed below in commits