fixes, populate stuff