Feature/fixes

Such bash, wow