Minor updates, basic funcionality is working