Feature/standalone tweaks