final fixes and shit
merge