fixes, add some functionality