final fixes, i hope..