updated to latest changes, continue fixing stuff