Fixes, continue work