minor move arounds + regex stuff, works better