various changes + more velocity stuff