fixes, proper stripping