Mainly Fixes, get things stable