[fix] started fixing stuff