alot of small fixes for creat part