Solved various bugs, style and readme updated