Fixed: issues from the rushed release, more finalized now